This patch is causing blocking failures in some 3rd party CIs.
The issue can be tracked to the fact that the PUBLIC_INTERFACE
interface might have no address assigned.
This reverts commit 93b2100c983e1c271a8d51aa7f4755a6445be6a8.
Partial-Bug: #1436607
Change-Id: I0943aa542b911fbcebb100543e0adbb38159b233