Merge "Fixing CarService and tests to use post VMS API review" into oc-mr1-dev