Add support for dropping text/html from external sources

Change-Id: Iaddc4a7e7cc42a468a62ae550637f3eaacb64e07
Merge "Add support for dropping text/html from external sources"