Merge "audit use of net.dns. property" am: 7813cf4249
am: e61a910b19

Change-Id: I2e77782f006028810dbec651fec4c768d8e1ec94