Merge "Snap for 9023430 from 14c252498e7f03de8c5c6a65fdf1d7393b5ffcd6 to simpleperf-release" into simpleperf-release