Snap for 7209783 from c9aa4a2a577d1488591ffb3270ff02b39aeab6e8 to simpleperf-release

Change-Id: I31dba273ad7a0b15e09c62c6e2e9231bf718cc94