Merge "Snap for 12901447 from 54a80ced6fa947095bb20fc7e49bd6cc2b1b2211 to simpleperf-release" into simpleperf-release