Merge changes I2cb4200b,If1fa00be into qt-dev
am: 6b2681521e

Change-Id: Ib279a80a19bcdaf53678921108c4932d04988474