[automerger skipped] Merge "Adjust tests for renaming groupHint to cluster." into rvc-dev am: 6489161fd5 am: 9afd861e3d -s ours am: 3c78a0aa71 -s ours
am skip reason: Change-Id I69f7a2971cc5985d0f0078aecc39d4d6a6130033 with SHA-1 552c570501 is in history
Change-Id: I697f4964b78384a8ae7a0b2c7d9e4065e8b7a784
This commit is contained in: