This reverts commit fbaa860e and relands b4f91321, with updated baselines. Bug: 142459906 Test: make droid Change-Id: I7736b2caa1c06db7ac837e53fffa8d3b38c4b579