Merge "Remove a __system_property_get call from the DNS code."