Merge "Fix StreamingMediaPlayerTest" into jb-mr2-dev