Merge "Better errors from unregisterNetworkCallback" am: 04e89ad631 am: ca6ebb0f39
am: 6531ea25cd

Change-Id: Ia959388c875c22e56f5f2867f33a7329ce4b3535