Merge "API CHANGE: expose backup/restore to the SDK"