Merge "Remove a duplicate TEMP_FAILURE_RETRY."