Merge "Add autobackup XML support for test BackupTransport flag" into pi-dev