Merge "Don't TEMP_FAILURE_RETRY on close."
am: bfa4fc3250

Change-Id: I2a7b03a10503f14627ebed3b6b8b679f700fc940