Merge "Snap for 12901447 from a002d63d04451568c519ce66cbca5c73e74bb60a to simpleperf-release" into simpleperf-release