Merge "Snap for 9023430 from d300bba0e4b3b84fef4cef81b1818cbc194a5b8c to simpleperf-release" into simpleperf-release