am 0f17d95e: am 9e070715: am f338fcba: Merge "Use the suggested stream if it\'s currently active" into lmp-mr1-dev

* commit '0f17d95e6fc0fb49fbaa87dbd3f04662e6d7e9cc':
  Use the suggested stream if it's currently active