am 03a40e30: am 70c114f3: am c13d0c87: am 320b8e53: Merge "Improve testSetNextMediaPlayer test" into jb-dev

* commit '03a40e30d29d504c6c92edbb9bcdb335b4f2f656':
  Improve testSetNextMediaPlayer test