Merge "Snap for 11400057 from 6127343e064f42d94e0a8ffe1c896329e6ff833f to simpleperf-release" into simpleperf-release