Merge changes I08c5006a,I6686b77c into qt-dev am: d42cb76a74
am: ba53982973

Change-Id: Ie76b60dbd6c44bb63d1417cbcfa07185950c9e88