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