Merge "Snap for 12821328 from 4b3e2712a942b681ecfe220e4ba3a850c62d3336 to simpleperf-release" into simpleperf-release