Merge "Snap for 5991463 from 6dd56ab1bec04be72d1630b065b701d0c5d2e4b8 to simpleperf-release" into simpleperf-release