am afc7b857: am e849af87: Cherry-pick two BufferItem changes

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