Snap for 12901447 from 1b9ed9fbd31ba3843aa1c359531bbbca2bf27142 to simpleperf-release

Change-Id: I761b17c2caedb0352fc9ebc93c1af5cd915a050a