"infinite retry config is lost when "resetRetryCount" is called. Change-Id: I2b737efa6092ad1254c8dc25840ec429f5c6e882