Merge "Fix a broken test in EmergencyNumberUtilsTest"