[automerger skipped] Merge "DO NOT MERGE (O) Revoke permision when group changed" into oc-dev am: cda08919cf am: d139755de8 am: 5e2a5a8ce1  -s ours
am: a8b12c4994

Change-Id: I2315205ef2681f5384a12e84a8274fe49d910709