Merge "Don't TEMP_FAILURE_RETRY on close."