Merge "Car support lib changes for shared support lib" into nyc-dev