Merge "Always strip java.lang. prefixes from types" into main