Merge "Snap for 12821328 from dfcea4b6de9d2c250461a2f51f500b8cc28023a4 to simpleperf-release" into simpleperf-release