Merge "Remove chips from trace data types"