Merge "Snap for 12134224 from 731c588d4c274564b859d6f8ed02e140059f3f88 to simpleperf-release" into simpleperf-release