Merge "Snap for 11510257 from 091c832fcf3c408dd09f9da3ed92c5efb066e437 to simpleperf-release" into simpleperf-release