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 am: f86cad799d am: 425c7a42fb
am: c4019a106d

Change-Id: I8163a2fc9bf23f73adbb17cacf89f46cfb26a6bf