Merge "Refactor UBMS to use LifecycleOperationStorage."