[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
am: 883ad332eb  -s ours

Change-Id: I8ac68b452633a3cfb3992ab53b5cc0e374f04d2f