Merge "Remove a duplicate TEMP_FAILURE_RETRY."
am: 67da939fdc

Change-Id: I7bf8f8b7c68ecced7c62122f59623eefe9bab285