Trace Compass contribution for 2021-06 M3 Change-Id: I0ae65174600da3ff5c9378222b2831bb2758526e Signed-off-by: Patrick Tasse <patrick.tasse@gmail.com>