This reverts commit b4fe52343c. Bug: 74950017 Test: manual Change-Id: I9749b9ae8f2f75b1bbdf7c6686a036db1f6f8a74
b4fe52343c