Merge "Fix Car Service Test crash."