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

* commit '8ba28c840589bcc7fa4dfcb26606748a0c0b7eb5':
  Fix heap data leak vulnerability