Merge "Snap for 12901447 from 4869f357dc98de32ce1fd771a0fe30e3a6375574 to simpleperf-release" into simpleperf-release