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

Change-Id: I6d8db5100e1fdbf1242ef8f48108cb73eae5b434