Merge changes from topic 'host_suffix_cleanup' am: 8031c2d2bb
am: f8f1a25850

Change-Id: I8b112d02b4a718ff258585e84fa4dfb3ba62dddc