Snap for 8346178 from b8397c5d0c95e8eac5ea1ade7ef44e48ade06fb8 to simpleperf-release

Change-Id: Id50ae2f671ed16bb2d7f75fe8e6572f8af9ec9f5