Merge "Make DeferredUpdates re-throw exceptions during testing."