Merge "Snap for 5991463 from 1576a007aaa639a89311b245a0363fa80e22dcfb to simpleperf-release" into simpleperf-release