This reverts commit 8dab4802. Reason for revert: b/199225554 Bug: 199225554 Change-Id: I207659037c36bd7cf55ad3186e45d3e112f18b8d