Merge "Fix a memory leak in ConnectivityManager." into nyc-dev