This reverts commit 80d274e041. Reason for revert: b/302542596 Change-Id: Iac1274dd844ff1baea1e8c7b22a54bf353c69974
80d274e041