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

Change-Id: I56340c7f580266a4cbb1d1956d063f33cd414e40