Merge changes I2b059826,I64bee605 into qt-dev
am: 565e2634e6

Change-Id: I4d81f2b478fe44473c94b7a89ff7782ecb6d0635