new build, cherry pick I5e62345 for ClaimHtmlGenerator

(until we have a nicer solution in master)

Bug: 61915
Change-Id: I439cb0fcfae45e7240ea8792a7acd526c7cc454e