Merge "Snap for 5590161 from fcf2bbd5a3d2553125dfc4055fe4ae57c5499669 to simpleperf-release" into simpleperf-release