Merge "Snap for 10957012 from 16467b971bd3e2009fad32dd79016f2c7e421deb to simpleperf-release" into simpleperf-release