Merge "Snap for 12901447 from 1df87eb7b4e45355d90a243004841b3640cb02ee to simpleperf-release" into simpleperf-release