Merge "Snap for 12901447 from 53f5e348a5edcde8b14b174d1f3287097c95c178 to simpleperf-release" into simpleperf-release