Merge "WifiP2pWfdInfo set device type bugfix"