Merge changes from topic "schematize_car_props"
am: b5278998c7

Change-Id: Iea4e7c25db3d3d95df70c2bbc242b3a35d7ff1c2