am 527b1d3a: (-s ours) am d1a72651: am b792f433: Merge "DO NOT MERGE: Make wifi scan interval when disconnected configurable." into lmp-mr1-modular-dev

* commit '527b1d3a06a6665006406a4239a58035642bc418':
  DO NOT MERGE: Make wifi scan interval when disconnected configurable.