Merge "Snap for 12901447 from 5d21bbc9b1393fffc73efc60ca607b18d3da4ae9 to simpleperf-release" into simpleperf-release