Merge "Use TestLogData to refactor host-side EDI" into oreo-mr1-cts-dev
am: 51ca915633

Change-Id: I051823f71df7eeed797714b250a2479fc5784ffe