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