Merge "Snap for 5429133 from e44bf1a4a2837100647446a72e10ee203ead7d6a to simpleperf-release" into simpleperf-release