Merge changes Ica8d7442,I39b8ad54 into tizen