Merge "Snap for 12821328 from 3a95f4c902f75299f3352c159d5a8f069b4f0311 to simpleperf-release" into simpleperf-release