Merge "Snap for 9982369 from 13af2f46a8f689f0295580d47de8c189a32ca9b1 to simpleperf-release" into simpleperf-release