Merge "Snap for 5432714 from cd68bda4ec03652d66dc43839a2b3a451d6037fd to simpleperf-release" into simpleperf-release