Merge "Merge "P2P: update WifiP2pServiceResponse creator" into oc-dev am: 387b97e68b am: ad13c7abc9"