Merge "Unrevert update references to backup agent timeouts"