Add some retries to try to work around transient failures

Change-Id: I000decebfdafd66aed1a1e0620eb926772905af4
(cherry picked from commit 66ee90186ba604c95fbb61144adf31e1ddd194f7)
2 files changed