Merge "Relax tolerance for FP comparison in test harness" into oc-mr1-dev