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

Change-Id: I834b7bf142a09d9d6aa869926ab5bf36593344e1