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

* commit 'd1ec1c47154b96cd123219615480809ce0072b69':
  Fix spurious restore session timeouts