Merge "Snap for 12821328 from 80b831357e9c77a16619ae66f96350a264626ee5 to simpleperf-release" into simpleperf-release