Merge changes I256e6ed1,I97d41ed0,I6b4177e4 into qt-dev
am: 111a49ba97

Change-Id: Idc53fc74c2181d84b4d3b4c401b449030be6ba64