Merge "Adjust tests for renaming groupHint to cluster." am: 1e1a2e4e70 am: aeda178293

Change-Id: Ifd2d659c4c386fb8895230ffc85b2a9086ee1a84