Merge "P2P: update WifiP2pServiceResponse creator" into oc-dev