Merge "Snap for 10448490 from 8a827d52961f590455ee2ae6403cbf37ddc61044 to simpleperf-release" into simpleperf-release