Merge "Use proper contains/doesNotContain logic for car" into sc-v2-dev