Merge "Prevent LAST_MODIFIED from changing after deletion" into nyc-mr2-dev
am: 8e796d593d

Change-Id: Iea615578927ad25ac81c791e372a61bfbeefa66f