Merge changes Icf330ba3,I7354c21e into tizen