Merge "Snap for 12821328 from 50919c7537ae9d05436a7661430ca2418fc1c920 to simpleperf-release" into simpleperf-release