Merge branch 'stable-3.1'

* stable-3.1:
  Format Java files with google-java-format

Change-Id: Ic3086f794b705892bf8a33dc0319aa7e0a96656d