Merge "Remove unnecessary TEMP_FAILURE_RETRY."