This reverts commit 6fc804b3f9.
Reason for revert: causes test failures b/136421546
Change-Id: I3b1dcd78aea6beeadb82626145e868954286bbee
This reverts commit 6fc804b3f9.
Reason for revert: causes test failures b/136421546
Change-Id: I3b1dcd78aea6beeadb82626145e868954286bbee