This reverts commit 8423dd15. Reason for revert: b/216248574 Change-Id: I3e0c2d4b453d50f773bdf55d26886f2df8accf2a