This reverts commit 6287fd1e. Reason for revert: b/148087431 Bug: 148087431 Change-Id: Ibcf751937dcda7ba8770b2c90c7ef446e044bdee