Merge changes Ibb3f46b8,I875b87a0,I2d005e17 into qt-dev
am: 64e64eb990

Change-Id: I9541e903885ed2fd5fc1b431f881d4aa33f03411