Merge "Fix StreamingMediaPlayerTest" into jb-dev