Merge "Snap for 10235775 from aa9650bdc46f27b7dc86804b19e671822f34c6d4 to simpleperf-release" into simpleperf-release