Merge "Snap for 9751898 from 6b5ac19aed6575e3b27ed6292567dbf9b4049556 to simpleperf-release" into simpleperf-release