Merge "Snap for 12901447 from 3779c18baf6a22cb5ae101ba0aa97074f0230744 to simpleperf-release" into simpleperf-release