Merge changes I4e32a588,I202c5653 into qt-dev
am: 79dd28f874

Change-Id: Ie97b9e48b8972fe0fcfd3eb761caeee6c8a9b095