Split p2p change to avoid eclipse errors on master Bug: 5002384 Change-Id: I446d4524b823d42c79daa24d43aa24012743e734