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

* commit '38281f1cbcd4804095828f19b7954d5219560fcd':
  Fix heap data leak vulnerability