Merge "Adjust tests for renaming groupHint to cluster." am: f1b1600637 am: 3d2d28eac5

Change-Id: Ifd2d659c4c386fb8895230ffc85b2a9086ee1a84
tree: 01a52f6915312c0306b8fa41d82525a104d5a9a1
  1. core/
  2. services/
  3. tests/