Merge changes I05aeb909,Iee31eed6,I2544a7cb into qt-dev
am: 315f7aabe8

Change-Id: I543bc5489c6cfe1a2ef45bdf34e46ef466914f73