am a130edc3: am 5002d02e: Merge "Recover from errors" into lmp-dev

* commit 'a130edc34859cc27b258de865551b1b62b920e5c':
  Recover from errors