Merge "Snap for 11400057 from 46e399cb8e2cc4fa17baedb9d7b58401aacb19b3 to simpleperf-release" into simpleperf-release