[automerger skipped] DO NOT MERGE Revert "DO NOT MERGE: Add coral_car and crosshatch_car to Q" am: ff65878137 -s ours am: 8ca5e08996

Original change: undetermined

Change-Id: Iaf0521e0310961ddaff4b2b36578e8ea2dcb75b2