This reverts commit 455443f4. Bug: 32432143 Bug: 25998400 Change-Id: I6625c9519341d6903a009da0aeebbe8fc1be9035