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

Change-Id: Ica89d2d6327f29d538802695b56c3904d735ce0b