Merge changes I6cd11c94,I35a35d20 into qt-dev
am: 192cf72105

Change-Id: I5762e4f3a93ced275a0fc7b7501ef20999b02ec9