Merge "Snap for 11510257 from 4c59056ff2cbf2d3c2cb5f37ccf57d372567a7fa to simpleperf-release" into simpleperf-release