Merge change 8399

* changes:
  BackupAgent-related lifecycle APIs need to be oneway