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

Change-Id: Id40e722a539fd5212abac6ff1ed76e6ff0a6bff9