Merge "Make sure database update succeeds from older database versions too."