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

* commit '7369d314d255afc1df5f7cf343785cc942042852':
  Fix alignment when reading note segment.