Merge changes I07928795,Ic8716cbd into tizen_2.2