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