Merge "[Backup cleanup] remove call to no-op method setBackupProvisioned"