This reverts commit 4e0c2505. Reason for revert: b/205193749 Bug: b/205193749 Test: manual Change-Id: I10e18a16ae3d6b8273c8509b5db037c9cc80795a