Merge changes I2fe2f89f,I304a6a46 into tizen_2.1