am d2d058b7: Merge change 3506 into donut

Merge commit 'd2d058b7d657e73255c3665c8b2f63845a8d25d0'

* commit 'd2d058b7d657e73255c3665c8b2f63845a8d25d0':
  Revamp IRestoreSession a bit