Merge "Snap for 12901447 from e6399b59e4be8fa5dadf07643270af2baca73d15 to simpleperf-release" into simpleperf-release