Merge "Merge "Add CtsEdiHostTestCases to cts-instant build" into pie-cts-dev am: 48c232ca3b"