Merge changes I2d2676d0,Iffc7acb7,Ibe373fd5 into tizen