Merge "Enable fixed LicenseHtmlGeneratorFromXmlTest" into tm-dev