Merge "Update test host used for TLS host verification." am: 29ec721673
am: 776e73a67c

Change-Id: Icfeb40d166addc1827cc6f3823888c2bdaa012dd