Merge "Snap for 11400057 from 2b14c7a5069e20033c50c1a1c8049b50513a43d2 to simpleperf-release" into simpleperf-release