Merge "Snap for 10957012 from ce7190ca2e76aa250d7fc29650c4ead52f5cdd74 to simpleperf-release" into simpleperf-release