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

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