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

Change-Id: I5cc53c49f8fff4fd7afea9571b8a63a768092abb