Merge "P2P: Fix hidl service discovery request" into oc-dev