Merge "Fix potential leak" into klp-dev am: 2f9eacc3ae am: a7602f8339 am: fe7c2700ae am: cbaad4b189 am: 8ff995a8ae
am: cfd6daa37e

Change-Id: I92f0c069616e6dd8e415d4a84917d7061857eb2d