Merge "Have registerNetworkAgent return a Network." am: 061d68a40c am: 59b776a9e5

Change-Id: I6460295b5c7c045a3d60f5c281295f3a0cf83110
tree: da1c7e2e672452268e643180445cf1e4d7a2d2e5
  1. core/
  2. services/
  3. tests/