This reverts commit a3369128. Reason for revert: b/316609623 Change-Id: I7438f3e55a29cf07da907d04a97b1f7bcc85956c