Merge "Add test size annotation to car tests" into nyc-dev