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

* commit '7b642b085413ffd92caa07933b21bc00b55f9905':
  Fix heap data leak vulnerability