Merge "Snap for 5590161 from 8279f3618c40dea389047bca07e9d580f245d690 to simpleperf-release" into simpleperf-release