Merge "DomainNameValiator: Remove workaround"