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

Change-Id: I2724dd4adf68aa8330b10b8f596d9d7db3619e03