Merge "[P2P] Eliminate separate storage of binders - a memory leak" into oc-dr1-dev am: 0dd8a3cd59
am: cd4fefc503

Change-Id: Iac1e18eb99bcd78c5d7b7617a28926f5dc1ebb99