Merge "Fix memory leak." into oc-dr1-dev
am: 02b37f7594

Change-Id: If382353979a9a31c2d46fd7398ec59b086d97ac6