Merge "Improve documentation around HostnameVerifier" am: abff3f4f21
am: 3ffddc2444

Change-Id: I28dc49eeeda3132762f10a57c36c826bbe5df888