Edit header form should not use parsed html for editing

Change-Id: Ie681df1c1bf58b6dd18f9abb51ac4dc4303041ad
Merge "Edit header form should not use parsed html for editing"