am 6c028d33: am 35972629: am 6c8cb05c: Merge "Make sure EmailContent is initialized before referencing provider URIs" into jb-ub-mail-ur10

* commit '6c028d332d21726bd75b9e187b3c78589be04d9e':
  Make sure EmailContent is initialized before referencing provider URIs