[automerger skipped] Merge changes from topic "am-878ea9668b274b6ba95050fbf51252cf" into qt-dev-plus-aosp
am: 8049c118 -s ours
am skip reason: change_id I98fda5751a7b1d2a6f3ad5b58682ad935fc30fa8 with SHA1 50b03113 is in history
Change-Id: I616c8fc43c750c0a2a361937649f926cc160a69e