Fix for fully qualified domain named host.

Change-Id: Id2ce37be414a88f7270ccdcb0ed187e533e78dcf
Merge "Fix for fully qualified domain named host."