Merge "STT: Add encoding option to read trace files"