Merge "Increase coverage for CarSensorManagerTest" into nyc-car-dev