Merge "Update set|getRetryIntervalsMs to Millis"