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

* commit '11626a91b6e695e7a8fa9e9a9f1a37df11cfb4e2':
  Revert "Watchdog: Improvement of debuggability"