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

Change-Id: Ibdaa9dcc3c77a36946485b255d0dbbf4747fafa2