Makes the messaging around retrying failures clearer.

Change-Id: Ia989c58a35895e0b12f38712cbbe4560240b891e
Merge "Makes the messaging around retrying failures clearer."