Merge "Prevent LAST_MODIFIED from changing after deletion" into nyc-mr2-dev