Merge "Use TestLogData to refactor host-side EDI" into oc-mr1-dev
am: fe7fe11e77

Change-Id: I5bc71fe5a1db7dd34912290df352c834a82e8ce9