Merge "Snap for 12821328 from a6fb49112a542cbf7929c2c94fc987d0c562fb00 to simpleperf-release" into simpleperf-release