am 1dccc9f3: am 372648a7: Merge "Fix access to freed memory"

* commit '1dccc9f3e889a5b702ec201129db689ab64a5eb8':
  Fix access to freed memory