Merge "Snap for 5933730 from 134e092c9b71d8145ba8c7540bac0c392630218f to simpleperf-release" into simpleperf-release