Snap for 6317425 from 436325eb5c8fbe70975fe0546afe88d5288ff3ec to simpleperf-release

Change-Id: I28412dfee2ed4809edcf9c6683014e5e89d36852