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

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