Merge "Snap for 11400057 from 989e4c781713d6b496156c0761a400a7d335c150 to simpleperf-release" into simpleperf-release