Merge "Revert "Add LifecycleOperationStorage and tests""