Merge "Snap for 9023430 from 06a9728c3609f856e87db38a6602196cec3ab727 to simpleperf-release" into simpleperf-release