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

Change-Id: I3607d28823ced42c14d39d99bbfd8ea346cfc835