Merge "Eschew unspecified IP addresses for DNS servers" into nyc-mr2-dev
am: 18f1a35d46

Change-Id: I5ce2d847aed00ee026b096e4e2c570ec0780f4f5