Merge "Remove useless map in SwapAllocator" am: 8a8c84114b
am: 9c3fb79b5a

* commit '9c3fb79b5ac82d5d3d58ba77c410c4868739cfb6':
  Remove useless map in SwapAllocator