am a3799abc: am 8d53a13d: Merge "Add a backup provider for the SDK" into froyo