Merge commit 'fef18bfc' into eclair-mr2-plus-aosp

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