Merge "Fix public API of ClassReferenceListBuilder"