Merge "Snap for 11510257 from 9a34347b9f5d1991bd0e19b56b88901eb4b0f858 to simpleperf-release" into simpleperf-release