Merge changes from topic 'host_suffix_cleanup' am: 7e0b322978
am: 130546f2d0

Change-Id: I6852d065d7a7ecb0a89a8335716a9328c71f3e57