Merge "Snap for 6317425 from 9a077af94ced8144ec87ec758c378da9b30274fa to simpleperf-release" into simpleperf-release