Merge "Fixing WifiWatchdog log flag"