am 1610b953: am 8d592931: am 6a8b7b65: Merge "Don\'t use TEMP_FAILURE_RETRY on close()"

* commit '1610b953bb824fb1954df7546cbb42662d520741':
  Don't use TEMP_FAILURE_RETRY on close()