Merge "Handle retry count" am: e74587af4d am: e1e3dc3698
am: c879ec2005

Change-Id: Ib1a614d3e3a964afc36585c9ca323e7a4cf97a39