Merge "Snap for 12901447 from a2e0cbe168bfc89c08c89b7894b79e06b84f7033 to simpleperf-release" into simpleperf-release