Cleanup the RetryTimeoutCallback(). am: b20de692d8 am: 07809e8e86
am: 0edf58f52d

Change-Id: I5d19ab3dd6e8372c24bb449d341ae8f45f5ea83f