Merge "Unbreak unregisterNetworkCallback." into nyc-mr1-dev