Snap for 7209783 from 569049911b5b7e15d0571a3dca363dbdd713c74f to simpleperf-release

Change-Id: Ica58d0477254bd224760b31f0be9191769b6ee3c