This reverts commit 73852a1d. Reason for revert: Causes a critical error in Cuttlefish Bug: 78299964 Change-Id: I66819556f2ed4bb05c133c200462b91e44d9ec23