Merge "Snap for 12901447 from 24f8a37c9301e794b10a1b2fb9e48906f99e3d3e to simpleperf-release" into simpleperf-release