Merge changes from topic "am-09c050a5a5e2427ea9bfdd9f6a16e8e4" into tm-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Merge tm-dev-plus-aosp-without-vendor@8763363" into stage-aosp-master am: 0f466f51 -s ours am: 0e797fc9 -s ours
  [automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 14543d1e -s ours am: 2f84f3da -s ours