add ip and ignore hostname when hostname is not set

Change-Id: Ica03525178ba417cc48364091a958a55d977ecb3
Merge "add ip and ignore hostname when hostname is not set" into dev/experimental