Merge "Improve the new ClassReferenceListBuilder API."