am 3ad86159: am 8a23898b: Merge "refactor MediaPlayerTest" into jb-dev

* commit '3ad861591649763d8e59a9d57a15827d39c1fbee':
  refactor MediaPlayerTest