Merge "Snap for 10957012 from 02424279a734a0cb64681cf11d5208a917662433 to simpleperf-release" into simpleperf-release