am 4b6ed7f2: Merge "media.log dump" into jb-mr2-dev

* commit '4b6ed7f255b696d1555ce71633ea08c961ec51dd':
  media.log dump