Merge "Add tests for CarApiUtil" into nyc-car-dev