Merge "Snap for 10957012 from d6112515808f522cc3c4a10f3bdd549873054262 to simpleperf-release" into simpleperf-release