Merge changes I0271d097,If55e1690 into tizen