Merge "[P2P] Public API to clean-up resources of P2P" into oc-mr1-dev