Merge changes I94874f53,I90133555 into qt-dev
am: 1d957da30b

Change-Id: I9714b761908e5ef72fa6791e4b55436cf33d3f89