Merge "ConnectivityManager: no double callback remove" into nyc-mr1-dev