Merge "DO NOT MERGE Unrevert update references to backup agent timeouts" into pi-dev
am: 3594cd54aa

Change-Id: Ic7e207d39529aa292938910352d6b0c420f23d88