Merge \"ConnectivityManager: no double callback remove\" into nyc-mr1-dev
am: 78feae882a

Change-Id: Ib7b10c59c1f7c84ec78c7527fba8a6c9aa5b0c05