Merge "Snap for 5590161 from d032c28349e4bcc93d9ed1af8ff6881778e9d569 to simpleperf-release" into simpleperf-release