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

Change-Id: Ic3935b826b2d1afbc8de71184aa69249521a8bdf