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

Change-Id: I2a3817e030adeef54012177380e886771502308c