Merge "Revert "ConnectivityServiceTest: more informative assert failures""