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

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