am 61bfd8cb: am 8337b0a8: am b4e202d8: am e62f2fdf: am 55afe895: Expand MediaProvider tests

* commit '61bfd8cbe21a3275c095865b6a9b8c723f4a94fc':
  Expand MediaProvider tests