Merge "Snap for 11526323 from 25dd085a36e94720dcb91ebe3fd158581c6c282f to simpleperf-release" into simpleperf-release