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

Change-Id: Ia86409c4cd80176c8f71b8a46c88024d0b68dd7d