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

Change-Id: Idd87bed1d0253e6971cb00dbe098f38a6320f2d9