Merge "Snap for 10957012 from 378bb71885c94aa063442a7477ec363aab95925d to simpleperf-release" into simpleperf-release