[automerger skipped] Add TEMP_FAILURE_RETRY where appropriate. am: 7d79742f05 -s ours am: 86fba120a9 -s ours
am skip reason: Change-Id I87b912e76889ed207ab17b862e4786ee44a382ba with SHA-1 172b0a0834 is in history

Change-Id: I64de77c9bc39560f0a47cde506a6b093385426a6