Merge changes I1a9e35db,I2083d704 into qt-dev
am: 315e2f6cf3

Change-Id: I36a5177cfc6b78f0c032265104fb5325b068ee24