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