[automerger skipped] Inline calls to MimeUtils. am: bf56d87dd1 am: 90af3fed63 -s ours
am: 0d8b60744b -s ours
am skip reason: change_id If62ee1a628feb909cd7b30ecf6e61f6845112d82 with SHA1 6396c47c8b is in history

Change-Id: I0f8a79bb2b71b709c8d56b5ab110b5585944ebb5