[automerger skipped] Merge changes from topic "am-d829724f7889490d818e6069212702eb" into qt-r1-dev-plus-aosp
am: b0fbbef44b -s ours
am skip reason: change_id Ie81751b762a780ed843bea255c1507ed03660c0e with SHA1 4bd0e67a95 is in history

Change-Id: I54826ca5e3a854f1c4b245449f38e110fb6ea97b