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

* commit '147ef9448540adaa4312e3cbc01adfc3c7902f50':
  Watchdog: Improvement of debuggability