Merge branch 'stable-3.5' into stable-3.6 * stable-3.5: Fix flogger format string Fix Flogger formatting errors raised by errorprone Change-Id: If0cff17369d64bed7504a0ba528e55b22c94796f