am 0641a5d4: am 7f8a4107: am 0165db38: (-s ours) am ff7256e7: Fix destruction issues relating to AllocationAdapter.

* commit '0641a5d4b1a3b0675c36f44adb05d0a5e20c3d56':
  Fix destruction issues relating to AllocationAdapter.