Merge "Add CarService resource overlay" into sc-v2-dev