Merge "Snap for 7817384 from 4394cdf90094161d5caf4f7237c883ab2862c2f2 to simpleperf-release" into simpleperf-release