Merge "[automerger skipped] Merge changes from topic "am-8700584e62cd434f85ab00d72db51e34" into qt-r1-dev-plus-aosp am: c316af7ecf -s ours
am: 7d5a7770fb -s ours
am skip reason: change_id I83f0cb2f6e878244f3d94ae77f64bb8ed2f78e0b with SHA1 bf23abb745 is in history

Change-Id: Iff53f92081fa6fea73127d64e0255736ed8a6706