Merge changes I05aad785,I8f7d943e into qt-dev
am: 4ed3e1bf4f

Change-Id: I2f1434938ae6d5309060849ae6a139a66f4efe56