Merge changes If54fa3a8,Ie7bd1459

* changes:
  Extract network observer code from NetworkManagementService.
  Change the signature of notifyInterfaceClassActivity.