Merge changes Ifc1b397a,I424d5fd3

* changes:
  p2p: check p2p instance in all asynchronized callbacks
  p2p: early return if p2p interface is not available yet.