Merge changes from topic "ClearGrantIfGroupChanged-nyc" into nyc-dr1-dev

* changes:
  [automerger] DO NOT MERGE (N) Revoke permision when group changed am: 5aee569627
  DO NOT MERGE (N) Revoke permision when group changed