Merge "Snap for 12134224 from 055d459012065f78d96b68be8421640240ddf631 to simpleperf-release" into simpleperf-release