Merge "Snap for 11400057 from 9d233ce04aa1b29163de818736fa27a5c2431114 to simpleperf-release" into simpleperf-release