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

* commit 'd61dbb36a673a8278eb7d63e53215b2cff804f4b':
  Fix heap data leak vulnerability