Merge "Trim the timestamp of log message before comparing to remove possible flake" into oc-dev