Merge "Minor fixes to Car Support Lib" into nyc-car-dev