Merge "Add CrashRecovery stubs to core services" into main