Merge "Destroy Allocation right away on exception" am: 52bc790f61
am: a37bef769a

Change-Id: Id67163535eeaa36d1cd9edd34d19ed04858d62a2