[automerger skipped] Merge changes from topic "am-499f522cabe64cbf9fa120abdbdf4831" into qt-qpr1-dev-plus-aosp
am: 78a2b617 -s ours
am skip reason: change_id If086c50ae803b384691f709057bceeac2fc1d9d5 with SHA1 387dc0ef is in history
Change-Id: I66e67c4a085300d2fea3e58e6c45dbd1a4864189