Merge "Snap for 12821328 from 1789df15502f1991eff51ff970dce5df8404dd56 to simpleperf-release" into simpleperf-release