Merge \"Unbreak unregisterNetworkCallback.\" into nyc-mr1-dev
am: f9b050ed9e

Change-Id: I35ee16554e17c503b1f5628629c2c0a48d85d399