Merge "Snap for 9982369 from 136a00cc964831c54e3d40dce88cbbac333faa9e to simpleperf-release" into simpleperf-release