[automerger skipped] Merge changes from topic "am-0915014a8cdb427da197d6f5e948985b" into qt-r1-dev-plus-aosp
am: 0e0bc5e7 -s ours
am skip reason: change_id I8a98ba2178039e25c65fc701855066a8788312e6 with SHA1 add688f6 is in history
Change-Id: Ie998fe97ffec7fe6f31087f21ef61e15401992ca