This reverts commit 42c25db0. Reason for revert: b/262412047 Change-Id: Iab60722f5a3624deb611535deb0020b89be1d5fe