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

Change-Id: I9c53f4af79d5a3b441012304bd8d27ce96884a54