Merge "Update hidden WifiManager API."