[automerger skipped] Merge changes from topic "am-7e9372ebcbec48df8185598aa79c5433" into qt-r1-dev-plus-aosp
am: e1e01667 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d932857 is in history
Change-Id: I3328670fc4b4f89dcbaf0c2639713dde041e807b