Merge "Add a unit test for a bug in registerDefaultNetworkCallback."