Merge "Update dhcp for p2p"