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

Change-Id: I0385ac58d360865ec8634102f7054846de0192b3