This reverts commit 2ef4e854. Reason for revert: b/271157681 Change-Id: I7224fd68027e2e9824694171547b8b2c808f9923