Merge changes I760dc5ca,Ia2da1dcf into qt-dev
am: c733f3bbed

Change-Id: If8c7a427137f013f8a3192f09485d7458b2dded5