am 7d1a6c5c: Merge "Fix destruction issues relating to AllocationAdapter."

* commit '7d1a6c5cac16795e5953d2b4d34671e34e907632':
  Fix destruction issues relating to AllocationAdapter.