Fix avahi host name resolution scenarios
am: 3dae2c9f75

* commit '3dae2c9f756721a220f8b59c70306031568a3ff2':
  Fix avahi host name resolution scenarios