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

* commit '0af5008096c9562f63808e37a60e5df150137526':
  Fix heap data leak vulnerability