Merge "Snap for 5590161 from 7dc8a3975b6d2f5f714dfef46efdc209af683757 to simpleperf-release" into simpleperf-release