Merge "Backup Unit Tests" into gingerbread