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

Change-Id: I6edd2524054447529899e68e1d3a733dd952c506