This reverts commit 5336e810. Reason for revert: b/272146290 Change-Id: I042a076750c5a59bb3fe3e6ff0e0845773d272bf