Merge branch 'stable-2.16'

* stable-2.16:
  Migrate to Flogger

Change-Id: I550d299c31a39e4cb1254383df9e381f617e4aa0