Merge "Reenable presubmit runs for BackupSettingsTest now that it's fixed" into oc-dev