am 677fead0: Merge commit \'264952afbf3986a2af4c2fa6b8daaed04f34fee8\' into froyo-plus-aosp

Merge commit '677fead05d1df2457c1f9a92d193b809b91319c0' into kraken

* commit '677fead05d1df2457c1f9a92d193b809b91319c0':
  b/2663512: "java.io.IOException: SSL shutdown failed.: Ok" shouldn't dump a stacktrace