Merge "Snap for 6844436 from 1057296cf7d4af15eb504ffdf6a1791aca1dce7b to simpleperf-release" into simpleperf-release