am 5eb2b0ca: Merge "Set P2p statemachine\'s network manager before starting Wifi" into klp-dev

* commit '5eb2b0ca76560cb8d707295aec42cb72f379eafe':
  Set P2p statemachine's network manager before starting Wifi