Merge "Snap for 6859336 from f3a14c00046f3497f8a573794974dc2a5be6f35c to simpleperf-release" into simpleperf-release