Merge "Make public the registerDefaultNetworkCallback API" into nyc-dev