Merge "Merge "Fix potential leak" into klp-dev am: 2f9eacc3 am: a7602f83...

Merge "Merge "Fix potential leak" into klp-dev am: 2f9eacc3 am: a7602f83 am: fe7c2700 am: cbaad4b1 am: 8ff995a8 am: cfd6daa3 am: 98a47295 am: 813dbf80 am: 3899cc3c am: f86cad79 am: 425c7a42 am: c4019a10 am: 7994267b am: a5d6111e am: 506107eb am: d25a99c4" into oc-dev-plus-aosp
am: a31d18c9

Change-Id: I22d83a9fb0a6347c8264668f9de5765c06548f71