Merge branch 'stable-3.1'

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

Change-Id: I131e4e8b407fbb6dc2953380fcf3170974aeb87b