Merge "Move test mapping to cover whole Car Sysui"