Merge "Backup all backupable settings" into oc-mr1-dev
am: 5444e9d445

Change-Id: I6c361a8e76596256aa98336c2ec7f6f24df5a782