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

Change-Id: I8041f69e03364fd5c5c9d2b0d1645e9cfe90e9b6