Merge "Snap for 12821328 from be2ad9d2cd96566ce22bfcd405fe21055b2f083d to simpleperf-release" into simpleperf-release