Merge "Snap for 10957012 from 5fad13b8a166a53cfc27f225561ec261ddcbbefb to simpleperf-release" into simpleperf-release