Merge "Snap for 10235775 from b991aeb5f78426dae7f9098905545570b029d1cb to simpleperf-release" into simpleperf-release