Merge "Snap for 11400057 from b8d1767a9963933efebd3f75145157cf9fe14c0f to simpleperf-release" into simpleperf-release