[automerger skipped] Merge changes from topic "am-c5942e1870364b5d8a631c29be850268" into qt-r1-dev-plus-aosp
am: 6b482e78 -s ours
am skip reason: change_id Ie8f53effe3e6e29a4523ebfa450c79fdf96ed585 with SHA1 37d1599e is in history
Change-Id: I5a568bdf11b8212aeeb7bd22f9f7b8575056fb65