Merge "Make sure EmailContent is initialized before referencing provider URIs" into jb-ub-mail-ur10