Merge "Snap for 12134224 from 1127f11c65efec1038a02a64e8910edf160cd69b to simpleperf-release" into simpleperf-release