Merge "Fix oatwriter code deduping"