Fix issue with hostname

Change-Id: Iff4a2a77e93082ef7f3f3217358c1e8c9823f8be
Merge "Fix issue with hostname"