[automerger skipped] Merge changes from topic "schematize_car_props" am: b5278998c7 am: e9f3d2e846
am: a3febe8786  -s ours

Change-Id: I2b66af3afb98629cc36afa542add0ec03a26a4d2