Merge "Snap for 12821328 from 854f867f2d2d3249db4244703965d146570e59dd to simpleperf-release" into simpleperf-release