Merge "Snap for 10957012 from 4fb3686148d916128dabd7528621b9e0d08a5ea6 to simpleperf-release" into simpleperf-release