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