Merge "Fix typo in streaming media url" into jb-dev