[automerger skipped] Merge "DO NOT MERGE (O) Revoke permision when group changed" into oc-mr1-dev am: 4cfd9bb78d  -s ours
am: aeff32e789

Change-Id: I344703c6effcc4902d11b882056736541257f6b8