This makes the code a bit easier to follow. Test: ConnectivityServiceTest continues to pass Change-Id: I0d0c0facc1e3ba07b53542b35da40ddc096ff92e
This makes the code a bit easier to follow. Test: ConnectivityServiceTest continues to pass Change-Id: I0d0c0facc1e3ba07b53542b35da40ddc096ff92e