Merge "DO NOT MERGE: Chassify Car Settings" into qt-dev am: f7b7dba6f3

Change-Id: I3d5fef9174b274397c81d5220b0fa2d11e887260