am 25e966ed: Merge "Log when there are an unexpected number of attachments" into jb-ub-mail-ur9

* commit '25e966ed72e496b193250894100fe847b9cadbb1':
  Log when there are an unexpected number of attachments