[automerger skipped] Merge "Adjust tests for renaming groupHint to cluster." into rvc-dev am: 6489161fd5 -s ours

am skip reason: Change-Id I69f7a2971cc5985d0f0078aecc39d4d6a6130033 with SHA-1 552c570501 is in history

Change-Id: Ic26210767bf8f4026c7074c048e77300e29d7a24
tree: 6c4e3b7409b2fdbeb4b238963d9ae6332ce831b8
  1. core/
  2. services/
  3. tests/