Merge "Use long for preflight check size in BackupManagerService." into nyc-dev