Integration: Merge soft-deletion features into master GitOrigin-RevId: 83baf730be2f256ad0d02271600392fda144b761