Merge "Snap for 11526323 from a42c8c5a45864920f6f6d645f016dbc4e7cc98f7 to simpleperf-release" into simpleperf-release