Merge "[P2P] Add binder to service calls"