Merge "Snap for 5590161 from 40112336219e605ef834d05c79bb07d37507c3c5 to simpleperf-release" into simpleperf-release