Merge "Snap for 12821328 from 0ac9a9daea5cce2e775d5da949508593e2ee9206 to simpleperf-release" into simpleperf-release