Ensure headings are HTML when needed

Bug: 63017
Change-Id: I4fd8ddf14ee408bf57d3ebb633dc0c0e607c25a8
Merge "Ensure headings are HTML when needed"