am 8e1c6a06: Merge "Speculative fix of IMMS crash" into lmp-dev

* commit '8e1c6a06dcd32faf10b9bdc9c9eb0d6cc055b7e5':
  Speculative fix of IMMS crash