am e849af87: Cherry-pick two BufferItem changes

* commit 'e849af8737d9302a7b24fa2f0083cde01c9cd4fc':
  Cherry-pick two BufferItem changes