merge nyc-car-dev into master

Change-Id: I9343259d052b4403d2960505484c08c98b2ddbfa