This reverts commit 6adeb2c9. Bug: 193831720, Bug: 168093983 Test: manual Change-Id: I0c0c3ac9ed63bafe419c8a127772d4042abbab89