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

Change-Id: Ie371aca665e0c40d43c08187eb9cfc821af6cf73