Merge "Fix NPE in BackupManagerService"