am d386c5be: Merge "Fix heap data leak vulnerability" into klp-dev

* commit 'd386c5be9505d2db24048a6e08ab714f2151dac2':
  Fix heap data leak vulnerability