Revert "Trimmed the branch to only the wireless_watcher sub directory"

This reverts commit 6cb5b455419516204b0ee06d88192433064cd56f.
Rebase from 'upstream'
Trimmed the branch to only the wireless_watcher sub directory