Merge "Add tests for Watchdog logging metrics"