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

Change-Id: Id117a9f4bdce187eecb63b3bd980f83231af0bb1