Merge "Add missing delegate for Resources.java" into main