Merge "DO NOT MERGE (M) Revoke permision when group changed" into mnc-dev