Merge "Move NotificationEntryBuilder to collection pkg"