Addressing review comments from ipv6 commits

Change-Id: Ie3148b22d4b0424cc9e6cd7e11773d952f97b338
Merge "Addressing review comments from ipv6 commits"