Merge "Snap for 12821328 from 5b8e51d82983972dce8f2878da0973eae2d39c7a to simpleperf-release" into simpleperf-release