Merge "Update WifiManager API"