Merge "Retry the update if ApplyBSDiffPatch | ApplyImagePatch fails"