Merge "media.log dump" into jb-mr2-dev