Merge "WifiWatchdog changes for poor link detection" into jb-mr1-dev