Merge "Snap for 10957012 from 5c387116e235ff706ba0baf63a9883b72c872490 to simpleperf-release" into simpleperf-release