Merge "Snap for 5437783 from 5c58e092f3df0e70235a4cdd41790a505e1ee596 to simpleperf-release" into simpleperf-release