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

Change-Id: I1960f76a9d237bed8b0cb9d3be109aedac7b697c