Merge changes from topic 'host_suffix_cleanup'
am: 7e0b322978

Change-Id: Ie3847326761f7a8c6019f19d8700cd1e9613b34d