Merge "CTS: Add host-side EDI" into nougat-cts-dev am: dae95ffe4b am: e7900f1757 am: 91ac1f5ec5 am: 644f530cf3
am: e12608fcb4

Change-Id: Ic937aad117e8b2ca3d39568692a2b0a065775f04