Merge "Improved connectivity check by also asserting NetworkInfo states." into nyc-dev