Merge "Merge changes I66eac0c5,I07602072 into qt-dev am: e252d155b1 am: db47069d52" into qt-r1-dev-plus-aosp