Merge changes from topic "am-fcaf83c4f43a4eb0ae1c08dcf7fa50d3"

* changes:
  [automerger skipped] Merge changes from topic "12940341" into oc-dev am: a9a03ae6 am: b172aaf7 am: 37beb317 -s ours am: 5ea00f8c -s ours am: b77727b9 -s ours am: f2bc09c7 -s ours am: 5a72f60c -s ours am: 28c0f6e0 -s ours am: e92d1f42 -s ours am: 8432837b -s ours
  [automerger skipped] Ensure permissions are revoked on state changes am: 3dfb5446 am: ebfe0735 am: b2152f32 -s ours am: ff63084c -s ours am: fb70a5ea -s ours am: 59511934 -s ours am: 27221c0b -s ours am: 0766b2c8 -s ours am: 47ef8438 -s ours am: 0815e743 -s ours