Merge "Snap for 11400057 from 21791d06ae062d3ea7249607e702c5101296f851 to simpleperf-release" into simpleperf-release