Merge "Remove @Presubmit annotation from SettingBackupTest" into oc-dev