Merge "Snap for 7817384 from 3d89df828fad9b56025f0ce3a0076031b2b2b92a to simpleperf-release" into simpleperf-release