Merge "Schematize Car system properties" am: 45e78cc5ee
am: f877f3a482

Change-Id: I0e5162053c753d57f2d7364df3a07a040602d313