Merge "Clean-up Navigation API" into nyc-car-dev