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

* commit '5966e7e5f4a7d79986dbea3415f29a595b259877':
  Fix alignment when reading note segment.