Merge "Snap for 11400057 from 6c4f286ca0d7e2488e6c84113484b20547de876f to simpleperf-release" into simpleperf-release