Merge "Move Wifi/P2p service components under services"