This reverts commit 76718dd9. Reason for revert: b/243646481 Change-Id: I6b200a3269e2a4fd1943c20e3074f19afe46f6dd