Merge "Framework changes for IPv6 / IPv4v6 data calls."