Merge "Snap for 12901447 from 94ec6bfc6dea4a232dbab38ed55e6098dce8b80e to simpleperf-release" into simpleperf-release