Merge "Inline calls to MimeUtils." am: 304132e995 am: d0457b20a2
am: e327e85014

Change-Id: If4af2b2689ac6cf2114ec20f9565b27ab0b47d1c