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

Change-Id: Iaf93437093fe461d202918d187a89832b0b9ddbc