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

Change-Id: I2a84d1752dc91e1d99f0b6773195176dba1b15d3