Merge changes I803a0a7a,I7c2a7a3a into main

* changes:
  Standardize watchdog messages
  Reduce over-severe logging