Snap for 7209783 from b988f24bcf4c9d0b8ea17ac717d256f83116f098 to simpleperf-release

Change-Id: Ief91ae765dfdddd8b5444acee66e23df71377ae5