Merge "Fix BackupSettingsTest (update blacklists)" into oc-dev am: 1c2964bdeb
am: 7430a65136

Change-Id: Ic943dd279ad77ea8fc88dd5166f02a1d7af17adf