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

* commit '8e30d53b6575a08ec0579fb08c8c4f055598d78b':
  Fix destruction issues relating to AllocationAdapter.