Merge "Add explicit dep on services.backup"