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

Change-Id: I23a0b46a58563d7bee5223f4baa4e4d1f4be4024