Merge "Snap for 9982369 from 0f065e796bfd2c6889c7af6fd99004491b1b6b73 to simpleperf-release" into simpleperf-release