Merge "Move CarServiceHelperService (again)"