Merge change 26791 into eclair

* changes:
  KeyStore: return null when response code indicates an error.