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

* commit '4870c813fe4a6fc7a176f22b5e7f96e9f7a4e469':
  Fix destruction issues relating to AllocationAdapter.