Merge "Revert "Revert "Move Wifi services to a new git project"""