Merge "Add methods for setCarMode()" into nyc-mr1-dev