Merge "Snap for 12901447 from 9e1b16b3aecab5fb30317f6fa6d240ff357131cf to simpleperf-release" into simpleperf-release