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