Merge "Snap for 5933730 from ca75c5e82475e5f48cf98398f69f5bf00fe03b83 to simpleperf-release" into simpleperf-release