Merge "Snap for 11400057 from 0116182f16cf4695d5f387fbcd556e3fcd134979 to simpleperf-release" into simpleperf-release