Merge branch 'stable-2.16' * stable-2.16: Format with google-java-format 1.7 Change-Id: I0c52d63a7dde2cee35b1fffba35d56b2f613ed9e