Merge changes from topic "am-25887f7e2fcb49fcb4503c33f5cf05b7" into tm-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge changes Ibd737c0d,Ibf5a9869 into tm-dev am: 52a97270 am: 43518885 -s ours
  [automerger skipped] Create lists of projects to share per dist target am: 570381b7 am: d5ded608 -s ours