Merge changes from topic "am-6bf9095fa9904037aa05612d7eac11ce"

* changes:
  Merge changes I5812ef2f,I1c981819,I118c291c am: 85e410c5 am: 524a7d13 am: d5331ace am: 0a6d1f90
  [automerger skipped] Removes unnecessary owners file in am: e9c0c885 am: 7dcaeea9 am: 380ec27f am: 5919daa0 -s ours
  [automerger skipped] Removes access for owners from parent files in am: 0befb7b2 am: 125de612 am: 4238ca8a am: 2b5ce85c -s ours