Merge branch 'stable-2.15' * stable-2.15: SingleUserGroupTest: Reformat with google-java-format 1.6 Change-Id: I097cc10a5b53135dbb0acf4dab5e78bf333cef22