Merge "Snap for 10235775 from 483e70dc11536954c4beea4e42d29e1f1150f821 to simpleperf-release" into simpleperf-release