am 40191799: (-s ours) am 6c450101: (-s ours) DO NOT MERGE Cherry-pick...
am 40191799: (-s ours) am 6c450101: (-s ours) DO NOT MERGE Cherry-pick dataSpace and BufferItem changes
* commit '40191799':
DO NOT MERGE Cherry-pick dataSpace and BufferItem changes