Merge "Update NetworkInfo public API."