Merge "Snap for 5933730 from c9943b468b27de46dc8a039d8e9973f442af0b8b to simpleperf-release" into simpleperf-release