Merge "Watch 2274882: Add a field to the db when we wipe due to an error in the upgrader."