am df9af422: (-s ours) Merge "DO NOT MERGE: Implement device discovery sequence." into lmp-preview-dev

* commit 'df9af422055d97d4743e00f789ae1964318a307b':
  DO NOT MERGE: Implement device discovery sequence.