Merge "fix last modified time" into nyc-mr1-dev