Merge changes from topic "am-2c6c21a24bd74c11a9dbe4650a51631e"

* changes:
  Merge "[automerger skipped] RESTRICT AUTOMERGE Read flag resource overrides. am: 6e157157 -s ours" am: feed8c99 -s ours am: ca1c4e50 -s ours am: e40726fd -s ours am: 11eae48a -s ours am: 4b73ecf3 -s ours
  [automerger skipped] RESTRICT AUTOMERGE Read flag resource overrides. am: 6e157157 -s ours am: 9f889e05 -s ours am: 8b1f7461 -s ours am: 1a8e3562 -s ours am: 21284a45 -s ours am: 376f9ebc -s ours