Merge "Handle retry count correctly"
am: a1bb191541

Change-Id: I68d6e150cd05b26ecdaf7e5869e17f0222bb8607