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

Change-Id: I8fb5bac2bb6b7665192c8c788d7818d637500935