am 03e590a7: am 7369d314: Merge "Fix alignment when reading note segment."

* commit '03e590a7285111b2f8ef25dac74e50a543ed8010':
  Fix alignment when reading note segment.