Merge "Snap for 11400057 from 89a044f2b10865a34eb7ac88cbb2ca057f73d99c to simpleperf-release" into simpleperf-release