IPv6 changes
(on behalf of Prabhakaran)

Change-Id: I16d47e843bbe85b7de8438205c76ae29d41c14a5