[automerger skipped] Merge "Adjust tests for renaming groupHint to cluster." into rvc-dev am: 6489161fd5 am: 42e012ca7d am: 85972ff323 -s ours
am skip reason: Change-Id I69f7a2971cc5985d0f0078aecc39d4d6a6130033 with SHA-1 3cd880b4bb is in history
Change-Id: I469e7291382a618d6ed28af81809666bee0ea036
This commit is contained in: