am a8a4ce97: am 597bb696: Merge "Add a config for whether to start in touch mode." into lmp-mr1-dev

* commit 'a8a4ce97b3dd901d047a436943e9f80e0e8be820':
  Add a config for whether to start in touch mode.