am 08191dff: Merge "Don\'t crash good-citizen restore session clients" into lmp-dev

* commit '08191dff4ce703498f66cd74b2d3377d98d55587':
  Don't crash good-citizen restore session clients