Merge "DO NOT MERGE (O) Revoke permision when group changed" into oc-dev
am: cda08919cf

Change-Id: I949f16944d202078a1f191a1284f1c48a46cbb58