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

Change-Id: I4ebddbdb360c6c0ce6acede11badc38dc6a228ed