am 4b3ec09b: am 99ccf407: am c2461eb3: Merge "Add support for bmp and wav content types in MMS"

* commit '4b3ec09b8199d3c70fbb025a73e8f0a46dcd22c9':
  Add support for bmp and wav content types in MMS