Merge "Snap for 11400057 from c08703b1afa2739bf6ef4766426c228338e40447 to simpleperf-release" into simpleperf-release