This task is causing some test failures from time to time. Implementing a retry should help to reduce transient failures. Change-Id: Iff2bb89e51690a7646ded209853abae0632f1985