Merge changes from topic "schematize_car_props" am: b5278998c7
am: e9f3d2e846

Change-Id: Ie302f69585892ea1465d9f4fce1b9699c8168f2c