Snap for 7286261 from 7cf1529946cd403283f49f930247f72723ccab30 to simpleperf-release

Change-Id: I855d031bcb7f2b3bd5ff41378aa5fae755c82d8d