Merge "Snap for 10957012 from c7c5c39ea597b2b02afc75b0f54213d4ef514b89 to simpleperf-release" into simpleperf-release