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

Change-Id: I3bd2e7242a8100590311cca40369adf45b06e52f