Snap for 6317425 from 15a431bd324beef987fe3569c7da4fad763c11dd to simpleperf-release

Change-Id: I68a6d82b5043124422ed86843d8b26676f34831e