Minor fixes to Car Support Lib

Change-Id: Ic24958b06b622f28dc5473e116d1f4c3074c9808
6 files changed