[automerger skipped] Merge "Adjust tests for renaming groupHint to cluster."...
[automerger skipped] Merge "Adjust tests for renaming groupHint to cluster." into rvc-dev am: 6489161f -s ours am: 4d02e250 -s ours
am skip reason: Change-Id I69f7a2971cc5985d0f0078aecc39d4d6a6130033 with SHA-1 b6bf8054 is in history
Change-Id: I73b54353fea73f05da299c7396e40350c623a103