Merge "Snap for 10957012 from 31b1011ea5403d3b29e622dbd0f77fc607ed6b06 to simpleperf-release" into simpleperf-release