am 7b68a408: Merge change 6426 into donut

Merge commit '7b68a408e9261a170c5ab9ae7ef999cc1d92ae0e'

* commit '7b68a408e9261a170c5ab9ae7ef999cc1d92ae0e':
  Remove a lot of debug-log verbosity