Merge "Snap for 11400057 from e8ec5783e575402d96260527de544aa16cd87131 to simpleperf-release" into simpleperf-release