Merge commit '383aa124de2a830be83a4c90bdd8a3f3e03f05ae' into eclair-plus-aosp

* commit '383aa124de2a830be83a4c90bdd8a3f3e03f05ae':
  fix an npe when a user tries to get an auth token from an authenticator that doesn't support it, like exchange