[automerger skipped] Merge changes from topic "am-c9436a7695ce48fda5b772e6490affc9" into qt-dev-plus-aosp
am: 75204654 -s ours
am skip reason: change_id If284bd3e0b29cb025833be29fa33179011c151d7 with SHA1 8eeb14e6 is in history
Change-Id: I0cf9bd98d440e9fb8492435749b264dc91eb147b