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

Change-Id: I9513c3b1faf027c3fc5a1d1abe4d35eddd7d78de