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

* commit '31e4eeb26f2c843d141f969271cff8e825909788':
  Fix spurious restore session timeouts