Merge "Destroy Allocation right away on exception" into oc-dev am: 1e820d7c4d
am: b579195b49

Change-Id: I06f8fdf87dee75c4dd697336980093c2005024fd