am 9f913efc: Merge "Fix eml crash. b/10945826." into jb-ub-mail-ur10

* commit '9f913efc3af44bc3c3a1f2b78ea4d1b5dd5f749c':
  Fix eml crash. b/10945826.