[automerger skipped] Merge changes from topic "am-8700584e62cd434f85ab00d72db51e34" into qt-r1-dev-plus-aosp
am: c316af7e -s ours
am skip reason: change_id I83f0cb2f6e878244f3d94ae77f64bb8ed2f78e0b with SHA1 bf23abb7 is in history
Change-Id: I82546d92867d79e2691ea5af77091f9495fd4133