Merge "Fix car service crashing" into nyc-dev