Merge "CTS: Add host-side EDI" into nougat-cts-dev