am 185fcadf: Merge "Fix spurious restore session timeouts" into lmp-dev

* commit '185fcadf898f0fe41461a632177dfd0d7e5dfb70':
  Fix spurious restore session timeouts