Merge "Comment out checks on oat files."