Merge "Snap for 12901447 from 8750a66f9088e165ef79c5082001baacbb5bbe76 to simpleperf-release" into simpleperf-release