Merge "To make mimetype for WAV file consistent over SF." into jb-mr1-dev