Merge "License validation tweaks for webpki." into main