Merge "Handle retry count correctly" am: a1bb191541
am: 06834e3094

Change-Id: Ib8932b3b6964d833dcd5549444e28855b41db04f