am 0611f477: am 90e42717: Merge changes I5d2be3c5,I9017256b

* commit '0611f47721e32e5386884881b055fde6eec5e3c0':
  Add argument to binder call to check key types
  Use hostname verifier directly instead of instance