Merge "Add TEMP_FAILURE_RETRY where appropriate." am: 3a8974d0b2
am: 33136a33d0

Change-Id: Ic28e8e7f29fb39323659d150fb0a016c796865f3