Merge "Snap for 9023430 from 3f70a0dbc890d9f125c4090b4ccfd5157ad87a64 to simpleperf-release" into simpleperf-release