This reverts commit 05e97205. Reason for revert: b/150666039 Bug: 150666039 Change-Id: I67a4ffe94e3caabd04a5b9305de3e476867bfbd1