Merge changes Ic0213db6,If8b2ae56 into tizen