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

Change-Id: I76b7f650a41a63df10c27e3413848b76bfcb2775