Merge "Fix failing CarNavigationManager test" into nyc-dev