Merge changes I81a93e78,I2d10f0f1 into qt-dev
am: 27aed65540

Change-Id: I6f715f02610e380b07bf9e7003fa96203186b8bb