Merge "Make the default backup configuration "disabled; local transport selected"" into froyo