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

* commit '1e5dd46133bd47445ba0657692fb86492acad705':
  Prevent memory corruption from use-after-free