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

Change-Id: I665c1f65a60926a70627db83da5c2c6f3e4f09c8