Merge "Snap for 5590161 from 19720b265900be40b1e479be10756bff177a7b86 to simpleperf-release" into simpleperf-release