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

* changes:
  [automerger] DO NOT MERGE (N) Test that changing groups prevents auto-granting am: d211338270
  DO NOT MERGE (N) Test that changing groups prevents auto-granting