am c0a2254e: Merge "Clean up properly if outcall for doRestoreFinished() fails" into mnc-dev

* commit 'c0a2254e083f7d2f38052012363cd71d1a6657dc':
  Clean up properly if outcall for doRestoreFinished() fails