Merge "Snap for 11400057 from 54d5b039021ff3c15a519ca95e5ef51b79e88a21 to simpleperf-release" into simpleperf-release