Merge "Fix potential leak" into klp-dev am: 2f9eacc3ae am: a7602f8339
am: fe7c2700ae

Change-Id: I9c4c5dbe0682992f9e7521ed3bf6a52d8311e00f