Merge "Snap for 7002008 from 7a4bee04f5781ffc53fd4c37f8b382c98afdddea to simpleperf-release" into simpleperf-release