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