Merge "Swallow parsing errors in parsing perf tests" into sc-dev