Merge "Snap for 10957012 from 260189e939c10ee8f74fd027d6c46c095a907878 to simpleperf-release" into simpleperf-release