am 94474515: Merge "Prevent memory corruption from use-after-free" into lmp-mr1-dev

* commit '94474515e035d726ff24c48233c452ce34ef7c01':
  Prevent memory corruption from use-after-free