[stable25] add wrapper for external storage to ensure we don't get an mtime that is lower than we know it is

[stable25] add wrapper for external storage to ensure we don't get an mtime that is lower than we know it is #1672