Merge "Fix EDI capturing for platform specific values" into marshmallow-cts-dev