Merge "Snap for 6079754 from 1f22097729682f02ddff07c8fbcf4edbf265d87a to simpleperf-release" into simpleperf-release