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

Change-Id: I91671796b7f3619c428f0084ced5d9a2b96cbcc3