Merge "Adjust tests for renaming groupHint to cluster." into rvc-dev am: 6489161fd5

Change-Id: I91768e43fb69c74058b248a03698d6ffedf94f55