am ea54b170: Merge "Clean up SslError"

* commit 'ea54b17038a6631f9e911a084c6138a57647915c':
  Clean up SslError