Merge "Snap for 9023430 from bb1a7bd835d7a38ea2516d2d4e5ea8b558356be7 to simpleperf-release" into simpleperf-release