am cd7d9d83: Merge "Don\'t use TEMP_FAILURE_RETRY on close in recovery."

* commit 'cd7d9d8374f45c7e2eb14d8dbabf3cf7c221a5b8':
  Don't use TEMP_FAILURE_RETRY on close in recovery.