Merge "Add secondaryId comparison for ProgramInfo"