Merge "Move delete support into base ActionHandler." into nyc-andromeda-dev