Snap for 6844436 from 262c28b52f817309994f1f501556627e562eab50 to simpleperf-release

Change-Id: I4fb8f6b9aa5fad8d874f8ffb0036cc3978414ba2