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