Merge "Snap for 12901447 from 457d02d44d5ae4523fe7a631f0ef676bc4aa830f to simpleperf-release" into simpleperf-release