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

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