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