[automerger skipped] Merge changes from topic "am-ad570698c4e44b98b54eb5df207cae19" into qt-r1-dev-plus-aosp
am: eba4c0c7d2 -s ours
am skip reason: change_id I0ef42c2f89b537a720f1ad5aefac756b0ccac52e with SHA1 f5e5af7f3d is in history

Change-Id: I715416d9271a979c360df4733fca198a4b3b12a3