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

Change-Id: I6fc5fd9ef1b35afa8513c2450cd625e376610236