Merge "Snap for 12901447 from 05d34b8ece66eff9cd96cdaa231a5fd345b4f92c to simpleperf-release" into simpleperf-release