Merge changes I3d885690,Id51a9bd6 into tizen