Merge "Snap for 12901447 from 33a6e89aa8ebde305ea3bc408d3b5b96756cacd6 to simpleperf-release" into simpleperf-release