This reverts commit a8cc8c10de
.
Reason for revert:
These tests are still failing: https://android-build.corp.google.com/test_investigate/?invocationId=I09000010224426738&testResultId=TR72029080085366662
Change-Id: I1ffac500a4dc411aa8ab03ab76b02e217b7d43de