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

* commit 'ce39d25f2c5908c3f6067a70b2ab504929e2eb5f':
  Fix spurious restore session timeouts