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

Change-Id: I6c8dfad4557cdc3ba6ba0a5b1407944fcdde3dc8