am 8ac8d555: Merge "Fix oatwriter code deduping"

* commit '8ac8d5556fae9c728bcebcc9036a1bbf40087c76':
  Fix oatwriter code deduping