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

Change-Id: I56fc827788c0efbfb856202de39c29b48a7a373e