This reverts commit 2eb7f0a34b. Bug: 74039047 Test: Manual tests Change-Id: Ifa38f7b1b805d781fbfc63cd71b01609f0a85d9e
2eb7f0a34b