am 9eb3bd88: am 42a58ecd: Merge "Revert "Watchdog: Improvement of debuggability""

* commit '9eb3bd88f14c386c89dd2576c3ca798f2493b0fd':
  Revert "Watchdog: Improvement of debuggability"