Merge "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." into oc-dev