am 0f6a8b83: am 5345f4c9: Merge "move activities for media to media package" into jb-dev

* commit '0f6a8b8309f78f15b330f7dd776cfbdf263aac36':
  move activities for media to media package