Merge "Fix opening oat files that are out of date."