Merge "Eschew unspecified IP addresses for DNS servers"
am: 0ac7232b7c

Change-Id: Id82777e6760c36e8f8dd59b447fa5862c295d59b