Merge "More fixes for: b/6910770 track any incorrect senders formatting bugs" into jb-ub-mail