Merge "Make NetworkManagementServiceTest pass again." am: 29b1826ff2 am: d3d6ddea94 am: c933ef6c54
am: dceef06841

Change-Id: I5ec6a8cc3422c1baf107c814f7a60b28fcc71cd5