Merge changes Ia03c4243,I8e581657 into tizen_2.2