This reverts commit 6831703c. Reason for revert: b/271842323 Change-Id: I00b7246ec085802796c6fb68c50021ca1d6ffbc8