Merge "Don't redundantly call transport.finishRestore()" into mnc-dev