Merge branch 'stable-3.7'

* stable-3.7:
  Fix flogger format string
  Fix Flogger formatting errors raised by errorprone

Change-Id: Ib7d6da66f8e9d519c2f924fd23dc3d48a65ced33