Merge "Snap for 11400057 from 2830eecd17024775d0f3822e62e4ee6c49249d09 to simpleperf-release" into simpleperf-release