Merge "Remove retry routines from mixed_build"