Merge "Snap for 9982369 from 5bf68823e604623e2366eb626bfcc10fda60729c to simpleperf-release" into simpleperf-release