more work on retry.

Change-Id: Ie32d68962fcbce9d705bbfa2e3bd705c52face4c