[automerger skipped] p2p: check p2p instance in all asynchronized callbacks am: b6aaecce75 am: 6178d7ecd8 -s ours
am skip reason: skipped by user jimmycmchen

Change-Id: I1265db571a6605ac6daf83eaf609cbf6d512f62d