Merge changes I2e0d0daa,I0b66fbb8 into tizen