Merge "Snap for 12901447 from 8a47503683196e933d1532733185b19999bf9e21 to simpleperf-release" into simpleperf-release