Merge "Add a backup provider for the SDK" into froyo