Merge "Fix build error from AssociationInfo constructor change"