Merge "Adjust tests for renaming groupHint to cluster." am: f7a876947f

Change-Id: I65d0298b17b60c9b4266766bf74928bf967c8b60