am 60d1e1a0: Merge "Watchdog: Improvement of debuggability"

* commit '60d1e1a09e4603e24652e930597ab204855eaa77':
  Watchdog: Improvement of debuggability