Merge "LocalFile: Ensure same timestamp for log entry and image revision"