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

Change-Id: Ie83694e722af77c7fc324b8b850e4308f093ab04