Merge "Snap for 12901447 from 78ba5208d59f78895f0806b3ec54debd1fbbc6e8 to simpleperf-release" into simpleperf-release