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

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