Merge changes from topic 'host_suffix_cleanup' am: 28eb980da9 am: e745604fb8 am: a5c32df454
am: edc1ed785f

Change-Id: I41054b56bb06d581afb13b7a610b29b9089d01a4