Merge "Fix restorePrivateDnsSetting with null hostnames"