This reverts commit 662dac06. BUG: 70724395 Test: Local build and ping Change-Id: I8f29e489a98563866f9181b7f0c51a6045886255