am 590f0f34: am b1d65d18: Merge "Fix runtime restart" into lmp-dev

* commit '590f0f345077cb40068e86db5a30185d454b7734':
  Fix runtime restart