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

Change-Id: I81250d42e18e9442d0c167d161738bd6034408f0