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

* commit 'abe8dfb0e37284395b36420ed62f1a93b99bdaf2':
  Fix destruction issues relating to AllocationAdapter.