Merge "Remove dead code: updateUpstreamIPv6LinkProperties in InitialState"