Merge "Snap for 11400057 from 72cc4897fa7aef52abf41b9a569cf576b866b92e to simpleperf-release" into simpleperf-release