Merge "Add a debug flag to disable time correction."