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

Change-Id: I8a60298c8c6a0df393fed10adb08b3ad6abcd18d