This change applies to both IPv4 and IPv6 because
the specification permits it.
Test Plan:
PASS: Verify for both IPv4 and IPv6 addressing
PASS: Verify patched change for IPv4 and IPv6 cases.
Change-Id: I99dcb31c51dd287eed8eb3a038a1814763a4c600
Closes-Bug: #1852481
Signed-off-by: Eric MacDonald <eric.macdonald@windriver.com>