Merge "Snap for 10957012 from 8e9a212552c9096cfeccaacd65dea1d1bca88107 to simpleperf-release" into simpleperf-release