Merge "Remove a duplicate TEMP_FAILURE_RETRY." am: 166c6a4390 am: 0b8a47c55a
am: 6bba8117cb

Change-Id: Ic87fe0fa9f0f7f4f4b5bc698136aadbc7eab752d