Merge "p2p: revise API Javadoc"