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

Change-Id: Ib6fe64a23674e72bbd216f10c53924364d073743