am 1787b4ea: Merge "Fix cancel crash" into lmp-mr1-dev

* commit '1787b4ea436f361e16c289755fa1a35c6e1c8845':
  Fix cancel crash