Snap for 7209783 from 75a976657b7a42a5fca3dd3c4d655ec9a809993e to simpleperf-release

Change-Id: I419c62012498649a770b919d57a666565e4eb7b3