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

Change-Id: I0694ca58e011969346047b0c2cd5762714d3038d