Merge "Revert "Limit System SDK to 34 for Java modules in the vendor pa..."" into main