Merge "Adjust tests for renaming groupHint to cluster." am: f7a876947f

Change-Id: I65d0298b17b60c9b4266766bf74928bf967c8b60
tree: 3ff38f38474bbc925da8c06a25feeeceaf7f5a47
  1. core/
  2. services/
  3. tests/