Merge "[automerger skipped] RESTRICT AUTOMERGE Read flag resource overrides. am: 6e1571579e -s ours"