am 679e8dea: Merge "Fix StreamingMediaPlayerTest" into jb-dev

* commit '679e8deaa19248f4fa6c1f6a80a4e34c4327d3fe':
  Fix StreamingMediaPlayerTest