am 75430ae8: am 8ac8d555: Merge "Fix oatwriter code deduping"

* commit '75430ae8588d316d4487269fd2773693c0463983':
  Fix oatwriter code deduping