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