am 36af36b4: am 9a302c61: am 963522f9: am 2151d8f9: am 78f7932d: am 7b642b08:...

am 36af36b4: am 9a302c61: am 963522f9: am 2151d8f9: am 78f7932d: am 7b642b08: am 0af50080: am 8ba28c84: am d61dbb36: am 38281f1c: am d386c5be: Merge "Fix heap data leak vulnerability" into klp-dev

* commit '36af36b4':
  Fix heap data leak vulnerability