am 10cb68fb: Merge "fix BufferItem flatten/unflatten alignment"

* commit '10cb68fb971c899d7d1eb6c131ecf59761af6ddf':
  fix BufferItem flatten/unflatten alignment