Merge \"Add methods for setCarMode()\" into nyc-mr1-dev
am: 81e5dffdd0

Change-Id: I316f9104627a17328df8ff141209bacfe1e14661