Merge "Snap for 11526323 from a83982159f6e5bb3d5d123ab2fed0e3d9747b4bb to simpleperf-release" into simpleperf-release