Merge "Snap for 10957012 from b771f86bcb3d0086ee5eda84da70634e7ab746dd to simpleperf-release" into simpleperf-release