Merge changes If2e7cd12,Ia9440c98 into tizen_8.0