[automerger skipped] Merge "DO NOT MERGE (O) Revoke permision when group changed" into oc-mr1-dev
am: 4cfd9bb78d  -s ours

Change-Id: I2b84b8b8cf53a5a1aef7e5a7169c3c6bd42e3ecc