Bring back P2P support

Change-Id: Id26e20c327b611a558062cbfa8425ad2c608b865