[automerger skipped] Merge "Improve documentation around HostnameVerifier" am: abff3f4f21 am: 3ffddc2444
am: 2538a27a24 -s ours
am skip reason: change_id I6bc86f8e7efc47521316d41e07ef546ea995061c with SHA1 9f5e6f22bd is in history

Change-Id: I96296f3e6f73ae05f4000162bfa5b34642a9ded5