Merge branch 'stable-3.6'

* stable-3.6:
  Fix errorprone errors [FloggerLogString]
  Update global-refdb/events-broker to 3.6.3

Change-Id: I9508e8ce6ace464cff3e0ecb88038d9f604fe910