Merge branch 'stable-2.15'

* stable-2.15:
  Change copyright to AOSP
  Format Java files with google-java-format 1.6
  Use Gerrit API 2.15.2
  Fix Sonar's "Generic exceptions should never be thrown"
  Collapse "if" statements to reduce method complexity
  Remove redundant parentheses
  Remove redundant toString

Change-Id: I90cd3c5f81e62fc7e35b2842ea086495207dccf5