Merge branch 'stable-2.16'

* stable-2.16:
  Migrate to Flogger

Change-Id: Ie45844822ca28f7b1cbef77ce5d25f06ef04d788