Merge "Disable timestamp correction for logs"