Merge "Snap for 12901447 from 7f069ff6b1f5d2a4223135a7255322778a7cc3c0 to simpleperf-release" into simpleperf-release