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

Change-Id: I098f990294e61338b9340518db82f6c6ba61c8f9