[automerger skipped] Merge changes from topic "am-08095d00f91c4ba9abace74f509b5eef" into qt-r1-dev-plus-aosp
am: 5be10a7e -s ours
am skip reason: change_id I8a98ba2178039e25c65fc701855066a8788312e6 with SHA1 add688f6 is in history
Change-Id: Id826758275718896a056d1df9f8a81cd236a4810