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