Merge changes from topic 'host_suffix_cleanup'
am: 28eb980da9

Change-Id: Ieadca3585e5f7ad93063651121a40753081d9448