Snap for 12901447 from 998067d276d9c7bb963c2e481643704990d6dcca to simpleperf-release

Change-Id: I4745e1364bf88186b38c59b221b80d5f0ea54e42