Merge "Cherry-pick dataSpace and BufferItem changes" into lmp-mr1-dev-plus-aosp