Merge "Snap for 6577974 from 75d91704548d828613a5d99b0f1d4a12aeb84f3a to simpleperf-release" into simpleperf-release