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

Change-Id: I21cb2a39503b42ae781c29a1eb2d5249b9e684a4