Merge changes I80bebcd0,I35f3718f into qt-dev
am: 08793a3b64

Change-Id: I975d97c9ca37aaf74a10a0d6ca4b71fc914047d4