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

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